Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project ARES: Announcement Signatures #6030

Merged
merged 11 commits into from
May 2, 2024

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Mar 27, 2024

About the pull request

ARES now logs who sent an announcement and not just the contents of it.

Explain why it's good for the game

Makes the available information a little more useful. It's all well and good recording what was said, but a little pointless if not including who said it.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Added the name of an announcement sender, if one exists, to ARES logs.
/:cl:

@realforest2001 realforest2001 added this to the Project ARES milestone Mar 27, 2024
@github-actions github-actions bot added the Feature Feature coder badge label Mar 27, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Apr 11, 2024
@Drulikar Drulikar removed the Stale beg a maintainer to review your PR label Apr 13, 2024
@Drulikar Drulikar marked this pull request as draft April 13, 2024 13:10
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Apr 20, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@realforest2001 realforest2001 marked this pull request as ready for review April 20, 2024 12:33
@realforest2001
Copy link
Member Author

Added the bits for security log, had to update some var names on other UIs to do so mind.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Apr 20, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In ARES_interface_apollo.dm there is still:
log_ares_security("Nerve Gas Release", "[last_login] released Nerve Gas from Vent '[sec_vent.vent_tag]'.")

In ARES_interface_admin.dm there is still:
log_ares_security("Nerve Gas Release", "[MAIN_AI_SYSTEM] released Nerve Gas from Vent '[sec_vent.vent_tag]'.")

In apollo_pda.dm there is still:
log_ares_security("Nerve Gas Release", "[last_login] released Nerve Gas from Vent '[sec_vent.vent_tag]'.")

In biohazard_lockdown.dm there is still:
var/ares_log = "[user.name] triggered Medical Research Biohazard Containment Lockdown."
log = "[key_name(user)] triggered research bio lockdown! (Using a custom announcement)."
ares_log = "[MAIN_AI_SYSTEM] triggered Medical Research Biohazard Containment Lockdown."
log = "[key_name(user)] lifted research bio lockdown!"
ares_log = "[user.name] lifted Medical Research Biohazard Containment Lockdown."
ares_log = "[MAIN_AI_SYSTEM] lifted Medical Research Biohazard Containment Lockdown."
log_ares_security("Containment Lockdown", ares_log)

code/game/machinery/ARES/ARES_interface.dm Outdated Show resolved Hide resolved
code/defines/procs/announcement.dm Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft April 21, 2024 04:27
@realforest2001 realforest2001 marked this pull request as ready for review April 28, 2024 14:23
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge with master and you will find more procs you need to update as a result of #6173

@Drulikar Drulikar marked this pull request as draft May 1, 2024 07:39
@realforest2001 realforest2001 marked this pull request as ready for review May 1, 2024 16:07
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

@Drulikar Drulikar added this pull request to the merge queue May 2, 2024
Merged via the queue into cmss13-devs:master with commit d8d463c May 2, 2024
27 checks passed
cm13-github added a commit that referenced this pull request May 2, 2024
@realforest2001 realforest2001 deleted the project/ares/announcename branch May 10, 2024 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants